Merge tag 'upstream/1.7.2'
authorLeopold Palomo-Avellaneda <leo@alaxarxa.net>
Mon, 6 Oct 2014 07:24:53 +0000 (09:24 +0200)
committerLeopold Palomo-Avellaneda <leo@alaxarxa.net>
Mon, 6 Oct 2014 07:24:53 +0000 (09:24 +0200)
commit8490060de319f7fab1d0aea7d5199184f44638e1
treeb6a71b464ad58a9d449e57e92b8054b7b504b7f0
parent835ac3e79db70624d4543485fe99d9d53f7d99f4
parent8ee0cd905c894d8294ada94bf0adeacd1ea55b84
Merge tag 'upstream/1.7.2'

Upstream version 1.7.2